Made some config changes to make it work better both as a standalone

module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized
with the separate GdkRgb release.

diff --git a/ChangeLog b/ChangeLog
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3662c1eb033f7e66c39f62b14b62a228a31e2eeb..4c965724c01875c116255150a22a84ebfcd965d7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Aug  1 22:17:00 1998  Raph Levien  <raph@acm.org>
+
+       * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
+       with the standalone release.
+
 Fri Jul 31 20:45:07 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index bec679cdbab89b3051cd9375d3c602639bef7f90..691e21d5bc582e3ec04acf856cd01fa56ebbc8db 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -27,9 +27,22 @@
 
 #define ENABLE_GRAYSCALE
 
+#ifdef GDK_RGB_STANDALONE
+
+/* Compiling as a standalone module (i.e. with Gtk 1.0) */
+/* gtk/gtk.h is already included in gdkrgbstub.c */
+#include "config.h"
+#include <gdk/gdkprivate.h>
+
+#else
+
+/* Compiling as a part of Gtk 1.1 or later */
 #include "../config.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include "gdk.h"
+#include "gdkprivate.h"
+
+#endif
+
 #include "gdkrgb.h"
 
 typedef struct _GdkRgbInfo   GdkRgbInfo;
@@ -2386,8 +2399,10 @@ gdk_draw_rgb_image_core (GdkDrawable *drawable,
          conv (image, xs0, ys0, width1, height1, buf_ptr, rowstride,
                x + x0, y + y0, cmap);
 
+#ifndef DONT_ACTUALLY_DRAW
          gdk_draw_image (drawable, gc,
                          image, xs0, ys0, x + x0, y + y0, width1, height1);
+#endif
        }
     }
 }